Autogenerated HTML docs for v1.5.0-rc0-ge900
diff --git a/git-pull.html b/git-pull.html index a518025..78e856e 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -602,9 +602,10 @@ named file should be in the following format:</p> <div class="listingblock"> <div class="content"> -<pre><tt>URL: one of the above URL format -Push: <refspec> -Pull: <refspec></tt></pre> +<pre><tt> URL: one of the above URL format + Push: <refspec> + Pull: <refspec> +</tt></pre> </div></div> <p>Then such a short-hand is specified in place of <repository> without <refspec> parameters on the command @@ -616,10 +617,11 @@ of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p> <div class="listingblock"> <div class="content"> -<pre><tt>[remote "<remote>"] - url = <url> - push = <refspec> - fetch = <refspec></tt></pre> +<pre><tt> [remote "<remote>"] + url = <url> + push = <refspec> + fetch = <refspec> +</tt></pre> </div></div> <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be specified as an older notation short-hand; the named @@ -631,14 +633,15 @@ corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p> <div class="listingblock"> <div class="content"> -<pre><tt>URL: <url> -Pull: refs/heads/master:<remote></tt></pre> +<pre><tt> URL: <url> + Pull: refs/heads/master:<remote> +</tt></pre> </div></div> <p>while having <tt><url>#<head></tt> is equivalent to</p> <div class="listingblock"> <div class="content"> -<pre><tt>URL: <url> -Pull: refs/heads/<head>:<remote></tt></pre> +<pre><tt> URL: <url> + Pull: refs/heads/<head>:<remote></tt></pre> </div></div> </div> <h2>MERGE STRATEGIES</h2> @@ -818,7 +821,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 31-Dec-2006 08:29:26 UTC +Last updated 01-Jan-2007 03:20:14 UTC </div> </div> </body>
